#5 Fixed compilation errors in TestSuite