manually merged some Models; junit test is set up