Phase 1 - Config-Slurper created, tests modified, existing classes modified