Couple fixes on UnitTests
Making version 3.5 - RC1