Cleanup of old tests
Context fix in proto.js, and tests for model/proto.js
Added new tests for statics and cleaned up old stuff
Merged in diverged branch
Actually cleaned up old tests this time
tests looking good
Merge branch 'rschmukler-test_fixes'