Refactoring: extracted sample tag data in a field

.... it will allow to maintain tests more easily and create
smaller unit tests
Fixed incorrect calculated size when using custom weight field