Added utilities with tests