Added  tests for new issues

Please review it