some tests adjusted