Updated some tests to include edge cases.