Fix test cases that break the build

/to @bajtos