Setup overloads of CreateSession
Fix failing tests