Cleanups and additional type-case test