cleaning up styles in tests, adding tests for timeout event

cleaned up version of #78