Fix feature 87 bug and importTest bugs.

Fix feature 87 bug and importTest bugs.
Merge pull request #118 from richardli5945/develop

Fix feature 87 bug and importTest bugs.