Cleaned up hybrid test to use tap commands instead of executeScript.

Cleaned up hybrid test to use tap commands instead of executeScript.