all test fixed