changed test files to suite nomenclature