cleanup some todos and build the stress tests