gah! why am I fixing tests that are suggested to be removed??