Fixed: typos where fixed, but tests were not changed accordingly