More configurability
Move tests around, to make names shorter