Reduce the number of remote API calls in setup steps and refactor cucumber tests