|#967| Fixing tests and build.