Fix #1: Added some tests.