[WM] remove vestigial dynamic var & fix indentation
[WM] add more tests user-specific config tests and refactor