Cleanups and reenabling tests