Config updates and tests

Fixes #87