6,madigan6: Fixed mock tests