fixing all sorts of tests... model changes and stuff....