Modified manifold test (starting to get somewhere)