Refactoring tests, breaking out unit vs. integration.