fixes #2788 - changes to fixtures and tests in preparation for testing adding/removing puppetclasses