add + adapted some tests