[0.0.8] Fix tests and finalise z-index system