Statistics, Statistics test, Some refactoring
Romove passStates at all
Clean tests