Remove global variables
Remove dependency on boost string algos
Remove unused include
Set expectations
Also avoid tuning for 686
Cleanups
Fix warnings