Testing safe room fixes