HV-708 Adapting to changed package of ExecutableValidator; Cleaning up tests a bit