fixing tests from master merge