all tests should have same naming standard
Merge branch v0.1

Conflicts:
	package.json