Not having a unit tests here has already bitten us once. We should add some small tests for the utility functions.