Reverted tester file to original 17 cases