non-working commit for sundar to view
mainly changes related to cleanup
Merge branch 'feature/config-combining' of github.com:local-projects/change-by-us-3 into feature/refactoring
Merge branch 'feature/refactoring' of github.com:local-projects/change-by-us-3 into feature/refactoring
fixed tests
Merge branch 'feature/refactoring' of github.com:local-projects/change-by-us-3 into feature/refactoring