bugfixes / test fixes (fixing ci)