Ref #106 - Fixing tests