Tests structure and format changed according to Yuta