Cleaned up tests.cpp