Removes references to obsolete cucumber tags
Moves Mock classes into test directory