Fix tests framework