I think it makes sense to add one overarching test instead of replace it for this one just since there's so much goo in here that it would probably make the testing not very modular/failures not very informative. Let me know if you disagree and/or I'm missing something.