Break tests apart more