Fixing some pre release tests