Add bucket and bucket-dir listins. Increase test coverage