@ hpp/teststrap.hpp: some tiny fixes