Convert optional values test to use no intermediate files.
Don't use shortened namespaces names.
Convert serialization test to use no intermediate files.