All of the original adapter tests pass again