move the rest of chapter 1 to core-test