updated tests and model