Test improvements, mostly related to BZ-1021886, BZ-1001972 / deploy operations