Fix tests to comply with Benny's changes