Updated some JUnit tests. Updated BaseCheckTestSupport