Fix broken unit tests by b502129bd10799c15eae4e991bdb44b6f6500d8b

Refs #97