Fixing last tests.