Two more *TypesController tests

Also, filter out deliberately broken tests during development