Fixed typos and renamed some test methods