Merge pull request #1333 from YBoy-git/collection_tools_refactoring #485

Job	Run time
test / checkmate	6m 6s
test / will_test (macos-latest)	1m 8s
test / will_test (windows-latest)	3m 36s
test / will_test (ubuntu-latest)	1m 3s
	11m 53s

Provide feedback