more bugfixes in tests