Mesh tests re-grouped