Replaced very old c++ test template with the new one that uses Alec's framework