unit test fixes for puppet 2.7