Refactoring of basic Cucumber steps

Change-Id: I906e08c7e9ddc35d9cac8991138db782d6f8dd06