fix tests after dguder's suggestions