spec cleanup
travis has issues with threads.