Adding some more tests for #114