fixing remaining tests.