Corrections from code review
Renamed test file