Rearranges to work with JVMM test framework.