more in model, more tests, now in DB