@ hpp/teststrap.hpp: some tiny fixes
Merge branch 'core'