Fixed test suite to reflect 5bc0a7c52f67d0ba348906a6538558c7ed284b58