Makes unit tests succeed

Refs #1