Fixed a few tests after interface changes