Salt copy filter tests and improve state collection tests
Salt copy filter tests and improve state collection tests

kitchen-salt/kitchen-salt,simonmcc/kitchen-salt,simonmcc/kitchen-salt,simonmcc/kitchen-salt,kitchen-salt/kitchen-salt