moved tests from foulder 'tests' to 'test'
Merge remote-tracking branch 'origin/master'