fixes, more tests