Rename vector type tests.
Remove now unnecessary includes.