Added more tests, added new coffeescript stuff