fixes, tests working