Added tests for validity strategy