fix tests and z-index