- fixing all tests