Update to Types.containsType; related adjustment to most-specific test Reviewed-by: mcimadamore, vromero