Do away with this horrible mock class