adapt some tests to new layout