Trello 376

Fixed tests