More tests and some model fixing