Updated tests for better testcase options