solved merge problems, formated graphics at Testfaelle