We already have a testInit.cpp/h for common things. Does it make sense to merge unittest.cpp/h with testInit.cpp/h to have just one file? (maybe unittest->testInit, to avoid changing a lot of #includes in *_test.cpp files).