Bugfixes, new test results