This is kding1's first commit.
Update the test.cpp to reflect recent changes