continue to improve spec coverage on new adapter-based refactor