Move test to test folder
Merge remote-tracking branch 'origin/master'