Cleanups for porting tests