A few minor test updates to match helper method names