updated cucumber tests
Merge branch 'testing'
fixed a few tests
commented out javascript tests