some that() tests and improvements