removed nesting for some tests