Cluster and sort Task specs

To make them more readable, especially when running rspec with '-f d'. Now I can see that there are a few duplicated or unclear tests - I'll probably get around to clean them up in the future.