fixing all tests and fixing a few typos