Removed duplicate tests and minor modification to make puppet 2.7.x happy