Test this /slightly/ better than before