Fixed typos and commented out test code