Added mock test support