fixing tests and such