wip
fix coffeescripts
Merge branch 'update_test'