test: change structure to nested