Start fixing tests