Work on tests, so they do not fail anymore. Mostly done.