WIP fixing tests