Cleanup of tests. Moved assertions from TestSetup to CustomAsserts.