Mind adding a few unit tests ?