fix some more left overs and tests