fixed the tests that got broken due to API changes, to text Brian's changes