Finalizing tdd