[WIP] Fixed some issues and updated 3 adapters and their tests
[WIP] All code and tests updated except for 6 of the adapters