Adding missing .bind(this) to callbacks and more test coverage.