(FACT-375) Reorganize acceptance pre-suite