Update tests for changes