Tests

Merge pull request #369 from SouthEndMusic/fix_merge_problems #319

Job	Run time
Tests (1, macos-latest) / Tests	10m 9s
Tests (1, ubuntu-latest) / Tests	14m 1s
Tests (1, windows-latest) / Tests	16m 8s
Tests (lts, macos-latest) / Tests	7m 40s
Tests (lts, ubuntu-latest) / Tests	9m 47s
Tests (lts, windows-latest) / Tests	11m 20s
Tests (pre, macos-latest) / Tests	13m 8s
Tests (pre, ubuntu-latest) / Tests	13m 48s
Tests (pre, windows-latest) / Tests	15m 29s
	1h 51m 30s

Provide feedback