Fix build of tests
More of the same