small refactoring

Signed-off-by: Andrey Rybalchenko <rybal@microsoft.com>
another small test

Signed-off-by: Andrey Rybalchenko <rybal@microsoft.com>