Cleaned up MockConfig