Added additional tests

These tests bring coverage up to 81.54%, fulfilling #29