Should we be duplicating this to all the test cases? Seems like too much. I can sort that out after merge if you'd like though.