improved Tests.cpp