Removed commented code
Added headlines to the test
Removed unnecessary code