Remove prepositions from step definitions

It makes easier reusing the step definitions in a custom feature.