Add additional tests for Type