Removed all static imports, and unnecessary main() methods from tests.