Added tests
Added counter incrementing
Added some extra counters