Fixed typos.
Better testing support.