Added utils test, fixed comment blocks