Merge "Junit for NotValidDataException"