Trello #459

Fix for unit tests