update infra tests and page

removed cfme_data dependency

dict changes

removed commented line