Fixing tests for issue #99