Additional testing to hit some edge cases.