Update spec.
Fix another spec.
Fix another spec.

Had to drop test for error handling on threads as there's no strategy for that yet.