Add test for vertical facet subdomains. Clean up code.