Try fixing tests