puppet-lint fixes, update test harness