refactor domain model and the corresponding tests
change surefire config