WIP2 more tests fixed