Updated for test104 + test105