No adds are not considered in the basic test. Usually I will consider Scale-ins/Scale-outs as a part of MM and work with it once the basic trading rules are in place for initial position, exit, reversals etc.
Why we need the diff scenarios listed is everything cannot be automated, we can take help from AFL and/or excel and do the rest part manually, so repeating it becomes a pain, if its based entirely on AFL or an excel sheet then multiple tests with different data is not a problem.
BTW, there is no rush, take your time to compile all that you need to express / write.
Thanks