Fixed tests for Custom run.