Fix non-Space tests