Updated tests to ensure C++11 conformance.