Updated junit test cases and add new test models