PUPPET-133 Improve validation
PUPPET-133 Rename test fixture