Fixing tests and typos