code fixes, tests now run again