Maven: tests fixed