Fixed tests to reflect the changes from earlier today