Fix for Issue#308 - added 2 test cases in core