repair some tests and phpmd