REFACTOR for test unit cases