Unittest bug fix, no more db passes