merged same ifs in template
removed commented out code
removed commented out code
changed test description
removed empty lines