Fixed tests, minus coffeescript test