DEVIDM-65 - Resolved nasty test pollution