Update tests for Entity\collision

* This should be 100% coverage for Entity\coverage.
* This also fixes several issues that were in Entity\coverage
* Minor style change. Rather than putting the long conditional in a
  variable, I just did "if do" instead