First pass at neutester reorg