Simplify standard test file tree
Add todo
Remove as many custom test file trees as possible