Finalised the testing and coding for fixing issue #749

Validation and tests added