Tweaks to adapter tests/ enhancements to err msgs, etc..