Clean up delegatable and update tests.
Update coercion and change tests to new syntax.