Added a few more tests for better coverage.