Removed TestClass - JUnit now working again.
Fixed various freeze bugs.