Updated tests directory structure to match new changes in cubex directory
structure