Added tests for the new issues