update model, add JUnit framework