fixing all tests