MAL-28 | Fix tests