Fix: reverse states
Remove old tests