Added tests for Pull Request #38

As mentioned by @before, I added tests for the changes introduced by Pull Request #38.

As I did not find any "blue print" for tests, I hope this "fits in".