Updated AutoTest, too.
Fixed some bugs, too.