Add *-less test back in with a shared setup