SWC-805 Clean up tests