remove lots of (over)commenting
invalidate config after config tests, not before