some changes to fix tests