2 - Junit script & Class update