Add ability to specify test plan in test definition