Remove bad smelling test code.
Merge branch 'DDBNEXT-794-BOZ-Bugfix' into develop