Some cleanup to make the specs slightly more roboust