ticket:1 Merge commit removed fixture, fixed test