Update unit testing to test for boundary cases