* Also removes a couple of duplicate tests
Part of a series of commits that are moving all of the filtering
done in simple scheduler into hosts filters so we can default to
the distributed scheduler.
Change-Id: I63b05d0c6476ff0ab9cc17e3e6c39f81bec37d77