Added validation handler, added invoke validation to test project