Reverted tests/main.cpp since it is separately compiled and thus able to take advantage of c++11