SessionBuilder improvements, more extensive SessionBuilder tests.