Remove query mixin and add base adapter unit test