Basic fixtures and minor test refactor.