Added more tests to cover all of the pruning.

Made me realize some of the pruning stuff was wrong. It however works
now :-)