Changed the structure of the DataLayerHelper which allowed me to clean up the tests and decouple them. Cleaned up the TODOs as well.