Some helper methods for an attempt for integration testing
Merge remote-tracking branch 'origin/master'