Trello #449 Fixes to the integration tests