These are copied from existing tests, should I go through and fix those up as well?