Handle the builtin package better
Added builtin package to a bunch a tests.