Changed names in autobenchmark to make it a little more consistent.
Refactored auto_test such to make it more consistent in its style.
Fixed bug introduced via variable shadowing.