Add tests for utils