Fixing some more FX35 tests for Mono and NUnit