Added Tests for finding Bugs and fix them
Added heading Comments