Bugfixes after test session