Streamline unit tests