Converted more tests to junit.
Also made tests run faster by using debugSkipDeployment hack.