Add more unit tests, split up unseparated words