MOB-311 Cleaned up tests