Removed Comments, Fixed Unit Tests