To catch future bugs similar to #464 and #462, as well as increase coverage
To catch future bugs similar to #464 and #462, as well as increase coverage