WIP fix these tests