updated test model, tests need to be adapted