New classes for testing and changes to the config