More unit tests for new utility functions