Merge "Add task selection to test suite entrance file"