Renamed test file
Relocated utilty into separate file