fix tests before merge into master