Adding in tests, and config transforms