fixing tests, etc