Fixed unit test + POM changes