Fix two more test classes