Split Unit/Functional Test Suites.
Merge pull request #356 from bantu/test-directory-reorganisation

Split Unit/Functional Test Suites.

* bantu/test-directory-reorganisation:
  Split Unit/Functional Test Suites.
Merge branch 'master' into php5

* master:
  Split Unit/Functional Test Suites.