fixed failing tests

fixed failing tests