Moved Entity into IComponent and fixed the tests to reflect this.