Modify tests with scenarios

Change-Id: If7e60b72ff309cbd958ea590ff655fcfab1800bb