refactor: Move more tests into their own files (#6473)

Follow-up to #6456 since this is working out well

Author: Hocuri