Streamline few tests