Add type test & scoping test