Removed 2 tests. Moved interrupt handling code.

Removed 2 tests. Moved interrupt handling code.