Streamline unit tests further