Z-Axis: Adds Entity unit tests and Entity location refactors