Organizing tests

Setup folders for existing tests