Cleanup one-one nested tests and implementation