Refs #670 - Attempt fix
Fixes unit tests so they pass