Fixing tests after issue #3