Adding option to simple/complete test