makeTest partly done.
Merge pull request #28 from zanax/master

makeTest partly done.