Cleaned up test.cpp