test cases and removed comented lines