Added tests for GH-283