Optimize test layout

This reverts commit 8dbfea5a9035783cee6b15f5f82f8c0e4522d51f.