As a result of fixing issue #15, a few tests broken. This commit brings the tests up to date with the latest behavior.