last changes and one more test