Fixed custom validator extensions when using Validator::extend

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
Fixing tests for 5.3

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
Fix conflicts.