Verify logic with new tests!