Fix tests layout