Modified round trip tests - added db check