Added other test and updated model