fixed test to return empty obj. need to fix the fixture.
fixed merge conflict.