Update for testing issues and coffeescript