Small fixes in code and tests (added fancy test counter)