Merge "Refactor methods to be used by other tests"