Refactored thread model methods into new class.
Fixed failing list threads test.