Clean up list of IBs, specify additional tests.