#SENSSOFT-193: Cleanup tests