ADD: another attempt at property mocking

Change-Id: Ie9f484f9aa7b6578838ee0ee62791f177cf9cd59