Cleaning up tests.
Trimmed down to just what i need as far as events.
0.4.0