fixed tests
removed duplicate logic
respect cfg.Version.Check