Bugfixes.
Added a test.
OASIS regen + merlin.