putting defs in order and closer to their tests