Fixes tests
Merge branch 'master' of github.com:alexdavid/Compositive

# By Kevin Goslar
# Via Kevin Goslar
* 'master' of github.com:alexdavid/Compositive:
  Fixes tests

Conflicts:
	package.json