updated cucumber tests, need to actually apply them
Merge branches 'master' and 'testing'