Changed actor arrangement to a hierarchy where all other are child actor of the World Actor
Cleaned up some test assertions