reorder test methods and other tweaks to fit in with book tests