Add unit tests.
Add smarter timing out.
Version bump.