Adapt tests to new names and modules