CoreTest: Adjusted tests.