Improved test structure using asyncjs
fixed tests which were broken by @sgade
gerge remote-tracking branch 'upstream/master' into test-structure-improvements

Conflicts:
	config.test.json
	src/web/test/index.js
fixed test
Merge pull request #18 from jhbruhn/test-structure-improvements

Test structure improvements.