Minor typos
Revised old test files