Cleaning up test.cpp