finished fixing tests