Add utilites and unit tests to help coverage