Update the test on .type to match the current spec and add a few more tests