change all return value to ReturnCode (test not working)