Adding Utils Tests.
Refining switch case statements
Fixing wrong package