Fixes more test errors