de-flakified some tests
Using new 'run folder' capability
Moved reporting specs into new file
moved discovery specs into new file