Improve test coverage.
Merge branch 'refs/heads/master' into topics/improve-coverage
Merge pull request #576 from chaplinjs/topics/improve-coverage

Improve test coverage.