very minor changes to testing code