Made test file naming more consistent.