added evaluation measures to testing