Commented out some future expansion tests