fixing tests and getting ready to rewrite them