Kept existing options and re-wrote the test case.