Fitness refactor and minimal tests