Remove top level nesting in test