Fixed typos, removed DBUnit dependency