updates to fix tests