TEST: Fixed unit tests.