Refactored the DataSources into one file. Performed necessary refactoring from said changes to the unit tests. Made minor edits to the unit tests to make them independent.Made necessary changes to the source code as well.