fix: incomplete, trying to get the db unit test cases to pass. #SOCRFW-80"