Firm types

This is now equivalent to `m3` :) I've fixed this test in #143 so that it returns the correct value.