In-between commit.

Trying to solve last 4 Jasmine test failures.