Fix feature 87 bug and importTest bugs.

Fix feature 87 bug and importTest bugs.