More thorough testing of the adapters