Modified tests to match new format of options