Merge pull request #1312 from Sakapoi/bages_refactor #419

Job	Run time
test / checkmate	5m 40s
test / will_test (macos-latest)	1m 36s
test / will_test (ubuntu-latest)	1m 52s
test / will_test (windows-latest)	4m 17s
	13m 25s

Provide feedback