Added Test Suite for Univ of Switz
Misc Changes