Finish fixing all tests