Added to previous cucumber tests to incorporate new functionality