Simplify test directory structure