Bring .tap tests up to spec