Adapted tests to latest improvements.