Add config tests; fix others