innecessary tests removed