Refactored to use shared examples

Change-Id: Id8f6c7a80351c72648e4fb8cc8b1317eb07b081b