WIP: Puppet standalone tests -- fix types convention