Yes. I will augment the unit tests accordingly.