Add missing unit test.
 Remove remaining reference to u32/64 types.