Finish updating integration tests, removes unnecessary files
Removes attribute conflict with ohai