streamline tests a little