sometimes the unit test where failing because the assert '>' didn't hold. Use '>=' instead now.
and resurrect a few integration tests.