wip
fix coffeescripts
wip
Merge branch 'update_test'