refs #603 - Updated tests