last three tests
manual marge changes from Ivo e Stephan