ADD: unit tests and indentation fix

Change-Id: I75447a7d70f21380fa6e0f2626a4229120a1b979