more tests, removed several bugs
Merge branch 'exhaustion' of github.com:xdanx/le-cycling into exhaustion