Rearrange tests in line with new standard defined by Pkg.test()