refs #7: Updated tests.