Update some tests for changes