functionality added to existing test test reformatted Change-Id: I27d2e5d0017ff4ac10f38a374ff16332695ae1d2