#1 fix tests