Update tests to reflect intended changes