fixing tests;