LUN-049: Improved Unit Tests