Updating tests, getting everything working between the updates