fwr: testing fixes