Fixup: Add value types to test build env