initial tests
added basic tests
Merge remote-tracking branch 'testing/tests'

Conflicts:
	package.json