Remove unneeded puppet files, fix serverspec tests