Started moving tests to use Cucumber