Fixes for testing puppet functions