Fixes, more tests