added enabling disabling some tests