Finished fixing tests after recent changed