Split up more test methods.