Removed commented test code and some comment typos