Wrong package names

[Ganath Rathnayaka]

Hi,
Though I moved the tests in to the test folders their package names were not
changed. I will change them and commit.
Sorry for the inconvenience.

-- 
thanks
Ganath