Separate tests for infrastructure and domain

This is just for logical consistency. It's a huge change without a ton
of impact, though.