Changed axis mapping logic slightly to remove some poorly handled cases.
Added units to one of the T fields.
Added a few broadcasting tests.
merge