Resolves Issue #119 (missing tests)
Resolves Issue #119 (with tests)