fixing tests
fixed failing tests