Added test subdir option support
Added temporary main surrogate test
CTest support
Merge branch 'feature/tests' into develop