fixes, tests