Renamed functions to make their context more clear
Test that a thread is deleted with its message when that is the only message in the thread
Merge branch 'master' into kingman