refactored out helper methods, fixed bug so that scenarios tests will execute