fix rebasing conflicts
fix failing test + testfixture