Changing test system
Changing test sytem to use with CMake
Merge branch 'V1'
Merge branch 'V2'