Reduce js function calls
Update some test fixtures
Merge branch 'reduce-function-call'