Source Cleanup
Utils Tests