Refs #97 - Fix tests.