fixes, tests now working