Many existing tests were quite hacky, these could be improved later. <details>  </details>
Many existing tests were quite hacky, these could be improved later. <details>  </details>