refactor image policy test part II