Bugfix.
Better testing tools.