Moved Entity matches() method to test class. Removed null checks from
Entity sublcasses implementing Drawable.