Started fixing tests