Trello #449 Fixes units tests