Removed some comments and whitespace
Removed some comments
Fixed test.self