Added a few more tests (edge cases).