extra tests: Split up and reorder tests more logically.