Fix for the error in the CI build. Simpler tests.