Changed to reflect new changes. Still need to fix the tests