Everything now seems to work as intended :-) (Although a lot of the
nature tests are still missing.)