Added a test to demonstrate a regression
Adjusted the tests for the expected behaviour
Merge pull request #267 from GrahamCampbell/check

[2.1] Added Another Test