added non-puppet testing stuff