fix tests, customs