fixed string issue
merge
merge
MAJOR UPDATE, refactor stats for correct tdd-cycle logic