Modified step definitions to test code more effectively