Added 2 new unit tests so my mistake last week doesn't happen again