Makes unit tests pass.

Refs #6