Corrected enforcement of static import order and started cleaning up tests.