Few fixes in tests.