begin to fix tests