Compile tests to Java6 too.
Change the template to the new instancing plans.