a few testbugfixes