Lots more simple fixes, lots more passing tests