fixing the forwarders accordingly
correcting the test accordingly to the new options