fixes, tests running