fix and uncomment failing tests