Refines CTDGV test and fixes preload scenarios for test