Add some additional tests to validate some edge case behaviors.