add count & capacity + tests