Minor refactor
Temporarily disable failing feature steps