Avoid starting session whenever possible
Fix specs