Task #123 test

Change-Id: I526931068661f2abda03a36e7054f6c53fd75605