fixing tests to allow running without cleaning