Fixed typo and remove commented out test code