fixed builtin tests partially