Minor adjustments of testing