add missing @Test and use Messages