continue fixing tests