remove changing tags to lower case and fix tests

Hi John, 

I remove changing tags to lower case and fix tests, as we discussed.
All tests are passed and aggregated report looks normal.

Thanks,
Michael