Continue fixing tests