Fixed PollThread join and Migrated the tests over.