Reorganizing tests
Build fix