Updates to testing code to move to Scaltest 2.5