Change tests to reflect latest changes (and some fixes / 
changes to them)