Added unit tests and corrected a copy/paste bug on Display property.

A bug and unit tests.