Refs #70 - Fix tests.