Merge "Added additional test case - DBFieldHandlerTest"