fix tests that broke due to changes in copy and logic