Rearrange traits, write some cool new ones. Remove arbitrary tests.