need to fix tests