Fix tests

Conflicts:
	Gruntfile.js
	karma.conf.js
Merge pull request #9 from srod/fix-tests

Fix tests