#2 - added more tests.