WIP on more tests