More TypeTests fixes for Mono