fixing tests, WIP