Minor unitests fixes
Version TM 3.5 - RC2

Including Publish files