BZ-1309: Revert test changes
Merge branch 'integration' of https://github.com/NoesisEnergy/bootstrap into integration