[GH-30] Fix tests