Cleaned up tests and typos