Tweaking and implementing new HasPropertyAndValue methods to all test sites