Added unit tests for util