fixed failing tests, please merge