Compilation errors fixed in Test suite