Merge in test.hpp