Could you add unit tests for these, please?