Adding tests; universalizing config management.