Decoupled last test classes after final sweep though