Cleanup and re-enable tests