simplify test file structure