Merge "Abandon sessions before/after running tests"