Just more minor WIP on tests