Removed extra changes from conftest and removed commented line