finished removing testng
finished switching to spring