Added checks for 3 potential tests preventing bugs