Master based adaptation

Improve adaptation - in particular add a test in (3f8d431).