Move more tests; remove some redundant helpers