added strip on testcriteria to avoid mysterious newlines
Merge branch 'stage'