Closes #1: Extended code coverage