MJ: restructured the tests