Added tests for util classes