reorganize tests
remove relative include paths
fix a typo
fix make test failure issue
Merge pull request #573 from licaiguo/reorgut2

reorganize tests
Merge remote-tracking branch 'upstream/master' into travis.osx