Fixed tests and added models