Added some tests for issue #33