Fixes more testing errors