Fix RSpec specs; @wip a cucumber feature