Fixed imports in test-ch.

Fixed error introduced by modules move. Removed redundant imports.
Port TestAPI to new API.
Merge pull request #9 from qnikst/fix-imports-in-test

Fix imports in test