Last fixes in tests.