Fix the rest of failing specs
Fix sessions for multiple-instance components