Improve Cucumber tests

Signed-off-by: Severen Redwood <severen.redwood@gmail.com>