Add test cases for utils package
Fix code based on refactoring