finished fixing all tests