modified Test Mock, more cases.