#11: Added more tests.