Fixing tests
Merge pull request #169 from lujameva/handle_oos3

Fixing tests