Address comments; also, demonstrate one more property in test.