This way we can properly raise skiptest

Modify the tests to no longer construct the classes multiple times and
to have them make use of the new helpers.make() function.