Got rid of vector with initialization list so that tests can be built with MSVC.