Updated adapters and tests to now work