Update with new configs and testing