Move app tests to all be at the same level of nesting