Added tests to check that #4 is actually fixed.