Add tests + fix tests which fails since last change.