Add tests files
Merge branch 'master' into tests

Conflicts:
	README.md
Move tests
Update tests
Merge branch 'tests'
Update Readme