Adding tests for a few util helpers