add/fix tests