updated layout of tests