Added tests for Bug #1