fixing tests,