All current unit tests green again, see #61