Adding test cases.
Fixed display nits.