Refactor ValidatingModelBase slightly to support easier overriding
Fix WindowManager tests