Trello 376

Fix mock tests