All test fixed