Fixing unit tests
Merge branch 'api-key' of github.com:avayanis/seshun into api-key

Conflicts:
	lib/api-keys.js