Fixing broken tests.

Basically needed to add more mocks. It also looks like this is what
was breaking Travis, so hopefully that will improve the project build status