Split models and added test cases