Simplified models and added testcase