Rearrange test to match new standard as defined by Pkg.test()