Merge pull request #1327 from YBoy-git/collection_tools_refactoring #461

Job	Run time
test / checkmate	5m 47s
test / will_test (ubuntu-latest)	11m 34s
test / will_test (windows-latest)	20m 11s
test / will_test (macos-latest)	8m 52s
	46m 24s

Provide feedback