fix tests and message