Remove interfering stubs, correct caps on test param