This should be its own test, no?