TEMP: Fixes and more tests