Clean up and DW integration for synthetic testing