new tests and fix model