Merge "Increase adapter test coverage"