Updated test to test interactions and to be more stable

Change-Id: If608cef429f6a18864d99780e9ee945adcc06b57