Updated tests to work properly

* Updated so tests work properly within Webstorm and gulp
* Updated markup
* Better starting point for TDD