Some more tests, make the option[builtin] types be static instances