fixed failing tests after recent commits