move test case to the test src folder (cont.)
Merge remote-tracking branch 'origin/master'