BLK-26 Adds titles to properties and fixes tests

Signed-off-by: Oren Leiman <oleiman@neutral.io>