fix tests
Merge branch 'RC1/master' of github.com:motherjones/smokejs into RC1/master