Issue #80 Updated tests