Fixing unit tests from previous commit (5e8aef3f8071ee15db39adb3732d57d4e99bccc5)