Clean up commit, formatting and add basic test for timeout validation.