Add tests for basic type substitution