Fixed db cleansing

Was between classes, now between separate tests

Change-Id: I8cfd13d963bcfaf4ceec041de6dac6270f7e6b94
Merge "Fixed db cleansing"