Round out the utilities
Round out the tests