Fixes #263

Modified 2 related tests, and commented on them to explain the change.
All tests are passing.
Merge pull request #283 from danielbraun/dev

Fixes #263