K.I.S.S. the tests, and on the way gain compatibility with WebStorm
Merge pull request #2108 from refack/KISS-the-tests

KISS the tests