Add trim shim to fix tests