usohail-cisco

For now, I removed the contrib directory from the tests just to work on the other errors. I worked on a few encoding issues and I was able to get...