Move failing adapter test, getting close to pass