Avoiding namespace clashes between boost and std
Fixing test