added test viewer, cmake changes